have you checked the timing (with a timing light). My recent issue with high idle was due to a CAS problem putting the timing out to over 30btdc.(had to replace it)
its worth checking the timing and adjusting the CAS if its wrong...
lol.. frustrating... I was on the verge of scraping it..